bitkeeper revision 1.768 (404909ffr4wvLzxTHDh9qHzdwhs66A)

Makefile, xen-clone, Xeno-HOWTO.txt:
  Fix XL makefile to accept ARCH override from the environment.

diff --git a/Makefile b/Makefile
index 388f3c425306c1b32e336557e981d68cf39a3603..c1798e196360bb8c8d1cf24ab4f6c6afbfc53c14 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # Builds everything except Xenolinux:
 #  cd xenolinux-<version>-sparse
 #  ./mkbuildtree <build dir>
-#  cd <build dir> && make ARCH=xeno oldconfig dep bzImage
+#  cd <build dir> && ARCH=xeno make oldconfig dep bzImage
 #  (<build dir> should be a vanilla linux tree with matching version)
 
 all:   

diff --git a/docs/Xeno-HOWTO.txt b/docs/Xeno-HOWTO.txt
index f89ac3b2ab31cb075ae051ec5a9d9e0ed2e47883..9a74bbd7495421be48ea61ba187103272c0018d1 100644 (file)
--- a/docs/Xeno-HOWTO.txt
+++ b/docs/Xeno-HOWTO.txt
@@ -95,8 +95,8 @@ oldconfig') but you can customise using one of the other config tools
 if you want.
 
   # cd /xeno-1.2.bk/xenolinux-2.4.24
-  # make ARCH=xeno oldconfig   { or menuconfig, or xconfig, or config }  
-  # make ARCH=xeno dep bzImage
+  # ARCH=xeno make oldconfig   { or menuconfig, or xconfig, or config }  
+  # ARCH=xeno make dep bzImage
 
 Assuming the build works, you'll end up with
 /xeno-1.2.bk/xenolinux-2.4.24/arch/xeno/boot/xenolinux.gz. This is the

diff --git a/tools/misc/xen-clone b/tools/misc/xen-clone
index 984ec7cbe32562abcf8a4fc76342ac3e205892d9..43ffb498ea445b416b8dfb9ca53ad1e31e8af25c 100755 (executable)
--- a/tools/misc/xen-clone
+++ b/tools/misc/xen-clone
@@ -86,11 +86,11 @@ cd ../..
 mv linux-${LINUX_VER} xenolinux-${LINUX_VER}
 cd xenolinux-${LINUX_VER}
 
-make ARCH=xeno oldconfig
-make ARCH=xeno dep
-make ARCH=xeno bzImage
-make ARCH=xeno dist || make ARCH=xeno install
-make ARCH=xeno modules
-make ARCH=xeno INSTALL_MOD_PATH=${TOP}/install modules_install
+ARCH=xeno make oldconfig
+ARCH=xeno make dep
+ARCH=xeno make bzImage
+ARCH=xeno make dist || ARCH=xeno make install
+ARCH=xeno make modules
+ARCH=xeno make INSTALL_MOD_PATH=${TOP}/install modules_install
 cd ..
 

diff --git a/xenolinux-2.4.25-sparse/Makefile b/xenolinux-2.4.25-sparse/Makefile
index 12d45ac32072ca0866dc48b3a6d27c0c7b140d77..b6ccfb4d95faa4b6503ffeceeec5d4bdf576c33c 100644 (file)
--- a/xenolinux-2.4.25-sparse/Makefile
+++ b/xenolinux-2.4.25-sparse/Makefile
@@ -9,7 +9,7 @@ KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 # Unless overridden, by default ARCH is equivalent to SUBARCH.
 # This will be overriden for Xen and UML builds.
 SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
-ARCH := $(SUBARCH)
+ARCH ?= $(SUBARCH)
 
 KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//g")